updates and changing to Postgres