updated for A5 core Async support