Adapted to new Stratton API