Improved valence - but I think we will have to go with a switch table