adjusting to new define
supporting trickle and locking