new changes to work with database