Changed the traversal mechanism