after basic merging done with nithin's code chathead v1.9