modified for new output