@anyone => Guard improvements

see commits