After my initial changes
Pulled and merged changes. And added my initial tweaks.