Updated logic in schedulers and gui.