susan's code fixes