Added some stuff from Ben Orenstein