some cleaning, working with new ESC