revised Castle Doctrine bill