Updated from 2011.1 to current