Update to @cvan's changes