more tweaks for Keifer