changed getter/setters