Remove need for y_map