added return to Else if and else on wacky.