Upgdating to 2013.04 changes... (incomplete)