Smoothing out the rough edges