rearranged to appease the msbuild gods