some errors highlighting added