Updates to experimental to make it work in singles
Merge pull request #4 from howaboutwe/updates_to_make_it_work

Updates to experimental to make it work in singles