Add bypass (26/37)

Add bypass