Update for new hunter and guard