Updated to use new Rectangle API.
Updated to use new Rectangle API.