- refactored / updated shuttle
- fixed conflicts