the code I removed screwed up everything so I put it back