reformatted, changed naughty variable name