Rebuilt to new Stratton API