Refactored counsel