New version for scheduler system.

Change-Id: Iaf279e4d295f11094f242b4f1107ad8a94c5e144