More changes by dev 2