Updated for SPA BlackBerry