Integrated Tom's html
Removed pwds