Add Completion and Some Robustness