(invalid rev) one more step towards supporting list of current states