Geom class changed to Rectangle