Added conditional for old/new case resolution. Default is new.