minor changes. what joe actually told me to do