New inputs; A bit of clean-up.