Edited Conditional Wacky

Edited and completed conditional Wacky