Added arg3 to take care of 1.3 switches