Simplifying a bit the logic