merged SinZ changes