Some changes, just to keep some commented featured before removing them