Revert a0ff866..ac4063a

This rolls back to commit a0ff86686ab9be7ef54deb7d097e09ba6f8342fc.
fixed broken code
*if/ifelse/if_else is working