re-add stuff that was accidentally removed