More work on deferred...