working - modified most outputs to match