Changes made by   (mladen@nasv.in).