adding simple reliability mecanism and a bit of clean uo