incorporated some of Anthony's improvements