Sprint 1 resolving CR issues