Simplified partially