Sprint 1 - Hot Fix (Final)