started on scheduling, fixed FA bug