reapplied changes from Dec 2012