Do we really want long form for two bonds and two charges + ?