finally moved them around