Refactored directions