Added set bypass feature