DFS fixing, commenary added