Updated for the new version of pygmalion