Changes made by AssiNET Assi (Assi.Ivomir@gmail.com).