A few adaptations - still need to work on gtu taging insertions