this addresses 1st part of #99