Improve mobile check