Changes made by Rayan Ali (rayan111@abv.bg).