Updates to experimental to make it work in singles