refactor scheduler to not skew time