fixes 123, cange view schedule and union