More changes #reviewthis moverall@velti.com