removed unised function
added getter and setters