some errors removed