Some more changes to allow for multiple passages