Final touches for PA3