Null safety

shape