Switch to new sequential system
Fix previous commit
Fix style