safety commit
Merged, and states are hilighted based on a list like we want