Simplified new version