Some polishing. Changed asynchronous mode