add rerun
add support for tables