Merge Pam and my commit