more tweaks to methods