UPDATED: Repackaged for the idea-framework