minor changes. not what joe actually told me to do