Changes by thomas'