More work on invocation