added getter and setters