integrate Christina's changes