All mistakes resolved