Add bypass (18/37)

Add bypass