Smoothed some things out