removed constructor, updated methods