consolidate a bit mroe