fixed staging # issue + collision on stage 2/3