moved consolidate... not refactoring -- old code