modified for mobile support