Some changes I found usefull