improve cross device support