Changed everything to a Rect