Revert "Revert "Schedule""

This reverts commit b8d1fccdf5f91dc72df9722762fe20cfd00022d5.
Revert "Revert "Stats fix""

This reverts commit 43590775afc2835a9a428b8a69d95f6a4b7e21a5.