Forge 965 Update + code fix