Simplified and hardened