some changes to exp setup -- Ben see comments