Added checks for bypass