Fixing 3G feature - not complete