Removed better error handling for now