Changes on files requested by Darko