adding back in some stuff that got lost in a merge