Refactored Taggart