Add jitter
Change jitter enabling logic