Some changes to guard