Last changes for Day 1 I think.