updated master with static bake