Refactored Actionable