Babak - fixing all the random things from brute-merge