New way to separate controllers missing some