mis-declaring functions). Needs much more love later. Discussed with espie@ and matthieu@ (couple of weeks ago). "sure" espie@