macro state is added
solutions set now can be collapsed to set of macro states.
short is changed by int