Replace code to be non sync