Errors removed and simplified