Added currentStatePredicate