I believe I have fixed the dup code in the Result/pm classes