Edited resolution [new]