Tested on Android + removed some code