Merge branch 'new_opt'