all errors fixed [2]