Updated spy view (wip)