Few changes
Now should work