Further changes to the experimental thingy