reflecting upgrade to guard 2.0