+ changes in if parsing