Converted back down to .Net 4.0