added return to if on wacky.