A lot of smaller and bigger changes and continuation of the Challanging function.