Refactored w6d2