12-12 fix all most done