Slightly better logic