Mem_free added
Merging for x