FWK changes finalized