added some more run.nexts
resolved conflicts