Added changes to Cat
Solved conflict