Added logic to isComplete. Should work. Not tested