Added completing option