updated and remove errors