more development on on-deman checks