large commit after priority 1 changes