Changes made by Iva Koevska (admatha@gmail.com).