Updates to previous merge