Committing extra stuff for iteration 2