changed getter and setter function