Updated the asynchronous methods to be more effecient?