Refactor | Beverly | add Direction