- Added more methods to be used for testing