removed ifelse