Adding an optional bypass