WIP: minor changes to expt