got rid of null check