Updated version after the Goal changes.