More sensible logic