Sprint 32 code updated

Code for Sprint 32.
Sprint 32 code