merging important updates