reverted solution to vs2010