Should be more relevant to the new logic