changed getter & setter functions