updating API getters/setters
merging