More changes that were included in the test branch