more dave-fying