Finalize changes for PA2