Fiddled with dashing, needs an audit