some additional changes as part of the big overhaul