Changed everything to ensure Tuenti's requirements.