Upgraded solution for VS2013