Made more android-friendly