Added HWI changes