Lot of improvements