More callback -> Deferred and simplifying.