Switch to using CGSize not CGRect.