Day 2 fix 3. Small design fix