Commit No. 20 - Redesigning started
Commit No. 21 - Design adaptation in progress