can we get rid of one of these functions?