finished modifying Action and T module