Day 22 Avent - Some improvements