Near-complete version