Trying to reduce the complexity on catvsdog :'(