Update for Jeff review tk 2