updated Christina's changes