updated get and set methods