Couple of changes to the order and way wn8 is fetched