revised for next release