last commit before overhaul