Updated with changes and language fixe