Bug fixes. Reworked "current way" algorithm