Change base to match my common use case