Changes to make exp work
Additional changes to make exp work better