[ADD] Changes made by Slavko;