Add prompt and remove some debug