Updated completion criteria

Fixes #455