a few tweaks, no changes in implementation