Major fix for Friends TimeTable