Some modifications in Completion form