Some more changes / thought plays