Added small asynch feature