Finished DMF 2013 changes