Adding 2g/2g support