Adding more updates to merge code