add ModalService
condition on repetition