Converted to visual studio project