Updated view... changed format.  Might be some conflicts