Latest changes on mem_shell