Some changes

Is in the correct branch?