added in some missing async & defers