add changes
Merge Update
Cats db work