branch for exact copy of onyx_magellan