added color ifelse