lot of enhancements - state process