Updates with PA #2 implementation