Tuesday fix + Friday update