some more changes as part of the overhaul