adding some new things. accidently removing some others