Modified version of v1.1 with path changes.