change logic a tiny bit