Updated with changes from Simplexity