Well they removed the more egregious portions but lines 12 through 18 still put "conditions" which have to be met in addition to the uninvited entry. I like it better now, but it would still give a aggressive DA opportunity to press charges and make you prove you had reasonable belief that ...