Small arrival shuttle rebuild