Simplified scheduling, still need finish though