got rid of == null