Took out error handling