Updated visual studio solution