t322 - Primary pass for improvement