compiled george's changes