changed to be compliant with the database, not yet tested