Updates to merge