Added Day 1 functionality