cleanup and adding noconflict
working on network timeouts