Removed pass, adjusted regex