Updated with new view and some debugging