Changed for Pandora Usage
Changed for Pandora Usage