Some changes, now it works fine!!