Replace experimental code with old main code