toward more modular design :-)

I've removed safeConnect, i'll explain to you tomorrow the raison