done with the conventions and the db corrections