added new changes to include cornelia's suggestions