MAJOR modifications to accomodate natbib