Added new methods and tested code.