Lots of updates and new ideas