Change logic a bit.