Execution context

I've integrated some of your comments ;)