dev updates for delayed load