Rest of work from Thursday 4/24