Adding Christy's updates