latest push with scheduler changes