migrate done; now update and plus can be done simutaniously
Merge branch 'psql' into dev