Tested Anthony's Changes