changes from alison, need to address bug from lourdes