changes from pandora port 2.5.3.0 by TomB