Updated with visual studio project