Changed language to po
Changed to po
Using a new class