Removed error handling draft