3 is what I did for the Cingular, and 4 for the the T-Mobile(because I am using the Cingular OS on T-Mobile). So I guess I didn't screw up too badly, LOL!

Thanks for all your help and patience, everyone who replied!!