add dashing back
merge