Added interactivity; removed expensive calls