FWC - sprint2 update