Gallium nine

Merge with one collision, so I kept your changes.