now migrated correctly to psql