Adding bypass.  TODO: fix this.