client-requested tweaks