More shield changes