Modifications for PA #2