More robust, new syntax. See README.