Fixed and tested r- and x-dependence, spiral untested