Feature/cat alterations