More mobile support; better if/else