Back to macro for sample_states