Begun replace null with None