Improved messages and kept filename for challenge8