Refactor fail. Updated references