took out error handler