Addressing last comments for merge