Some changes
Fixed arguments