Added Tech, and clean-up.