Any thoughts on how to improve this? I'm not completely happy about the link between P & r... Thanks!
