Simplified, no persistence