Fixed problems and tested with @CatherineH.