Revise input format following discussion with John/Steve