More changes from esper