Unfoldability constraint added
unfoldability criterion extended.