Code changes done in Sprint 48.

Code changes done in Sprint 48.