Slight refactoring, add oldRefs. #8