More changes! Please test and give feedback