Updated version of this edit (x)