do not merge: update API for Josh's optimizations for Eclair
2 files changed