pass9 updated. TODO comments