Change logic a bit