Choking logic added