More changes, thoughts..