removed unnecessary checks + modified workday block