rnd changes
finally obtained working version