Lots of changes - Github issues broke history