Feature/visible waitexprs