A little more info. Some refactoring.