A2: Final submission

This the real final submission for A2