Update with AT&T tweaks