Updated usage of dict containing p&r