started integrating database changes