Updated for BlackBerry