Simplified for open-source