made some changes to multi pass