[greg] fixed James'  great new features.