Babak - initial comment
Babak - after brute force merge