fixed the commutative diagram for SWFS