improved performances on android