If we remove the concat this will not be needed.