made it so no null pointer