updated for new multiple block height support