More tweaking to personal pref.