done with the conventions and the db corrections
done with the conventions and the db corrections