Change sup to one_for_all