Reduced fork with Framework.

Reduced fork with Framework.