Code update for Sprint 42

Code update for Sprint 42.