final commit before overhaul