Collection View model is now correct