Updated Rect Handling