implemented jessica's changes