Update A3 with updated source code