Med the logic flow nicer at least