Merging back some changes