Updated to use Grizzly