updated for vs2012