Updated to work for Xperia S