Lots of changes, more stable