Refactored look where you're going