Dfoxpowell/nightmare v1.6.0