tweaking for distribution...