Adjusted class list after validating against production again