changed getter setters