Added error handler and high accuracy