enhancements for multiple states