Correcting advanced tool + removing "calculating"