tweaks to base handler