3.6/dev intrepid lwright shuttles

Extract this into separate function