rename, add new fields, add all 4 views