Trying to fix homogenous logic