these are 2nd attempt at may 14th changes, made on may 15th