Code after fixing bugs and text case passing