Changed scheduling to use an offset based approach