updated getters/setters