Pending code from the previous merge