Few changes to origina file.

Might be needed to get it working.
Some more updates...