refactored w6d1