tweaks based on jseifer