Added ability to check if complete