Probably much, much safer.  Updates #1