Merged changes and fixed conflicts
Added random schedules