Added Jessica's changes