finish 11.2 with stupid errors fixs