wacky commit 20

changed if else to ternary and tested