Code update for Sprint 40.

Code update for Sprint 40.