amendments needed due to merge