merging latest changes