Updated Script to catch more buggers