Added new methods and comments