Upgraded visual studio solution