Fortified/Refactored