updated all listeners to support mobile