some work to support tutorial, performance