Finishing update phase 1
Merge branch 'unify'
quick fix