adding back changes from 3/21 commit that were accidentally deleted

hey kyle - i was looking back and definitely overrode some of your previous changes - sorry about that. adding them back in.