Updated for Xperia SP