Refactoring & new refs