update to follow guard 2.0 changes