Small modifications using ActionUnitSet