remove ifelse/add incase