renamed these so that they would be easier to integrate into a project