merging latest code