Progress on A05
Synchronizing commit