Fix to make program faster and stand the ascyncronous nature