memory leak WIP;
renamed some path;