Added more functionality based on 'requirements' changes, more than one cat