.7.2/.7.3 changes (untested)