Agreed on both counts. Will update that.