Can we just get rid of this method entirely?