updated to use fields from the homepage