removed some error handling