Changed to .Net 4