fix terminology... may be broken