merge in dashboard enhancement