following @skurfer's suggestions