(and updated docs)