updated with anna's comments