Updated for use with Xperia S