Change logic

Change logic assuming future versions of windows will support 2012 syntax