Added to advanced mode (untested)