added -C bypass, and corrected functionality