Update a6

Almost done early.