SHIRO-443: Simplified