Made methods public, added 'rect' to Context