Changed feet shape and removed unnecessary Null checking