Fixed from direction refacoring