Merged Pet Controllers into a single one