last 2 errors fixed