Walloper updated to new model system