Just before migration to VS2012