changed getters and setters