new esperance + minor changes