Updates for Sprint 36 code

Updates for Sprint 36 code