Solution remade from VS2012