Added things for independent SW3 operaition