CRAY - Added more flags