Add PRED and CHILD macros
Add else to where