refs #13 does this look better?