flickering removed
flickering removed
some additional tests