Commit

Memory related stuffings