Still working on a new idea to fix the android side