removed some setters