Refactored Trapd. - Deployed.