first changes by bulentv