changes for XS and Android