+ error fixing not finished