update all fixed v1.2 of matan