Group into fewer states to speed up handling
Merge pull request #1 from FEI-Lithicon/master

Group into fewer states to speed up handling