More changes. more bugs