First commit from Feride
Second commit from Feride