Changed way to deal with contrast and non-contrast T1