Updated with vs2010