2012 consolidate changes from other user