Trying to Implement the Complete feature