async + small upgrades