Final version
Final version fix lowercase bug