More changes..Time for test build