Added more private and public methods