Retrograded to chages from 2012 to help in merging 1.1 version