Re-add working/guard; trimmed down