change structures and add usefull tool