get/set methods updated