Speed up Grace

Grace