New version, addressing the Schedule issue