Therhold added
Refactored