added cloning and modal service