Got rid of all errors