Update to better support mobile