Change to use ARC. Add support for delayed work until