Added new methods, preserved original code style