Including Bhawan changes into ZJetsAndDPS