Got rid of the overlap, because it was more confusing than it was useful.