Some changes 

I can work now :)