adding changes from 2012