Changed method names, added error handling