fixing up after merge