Revert "Revert "trying to handle directions""

This reverts commit 8434242ac4be83a5eb3541c56ca3ede353a4be89.