updated per changes suggested in LATESTEQ-251