back/forward port changes from A3