WIP
Updated orb