ftwo states/expressions added