changes from ofc