added more mobile support