Before merge 11.19.13
Merged Log