Adding final changes to a6.