Melissa's changes