Few mistakes remaining now