Adding 3g, segregating some funcionalities