Changes tested on Andriod