New bits after teh refactoring.