Added Greg's stuff back to write ellipses out that got lost in merge