Sprint 22 - Enhanced product performance

Sprint 22 - Enhanced product performance