new context handling, no longer using selector as context, rather reference