removed error handling