Week 8 re-commit with same fix of the quotes issue