Add bypass (28/37)

Add bypass