Was the Castle Doctrine expanded also?