overhaul of some things