consolidate and update