final changes by me (Nathan)