Added departure scaffolding