Added bypass