Final update of Rev.A