Improved conditon to detect ways
Improved conditon to detect ways
Function now correctly order
Something