Updated actions, error guards