1-7,8 fix + upd to 1-4