improving demos. * adding  to fix tap selection