Refactoring and R&R method now working