MB-81 #Reorganized for async calls