Added and edited guards