Lots of changes. Tried to get trends working