done with the conventions and the changes in the DB