Rescheduling System  working 
++ minor bug fixes