Worked out the bugs from Thursday