fixed w5 according with mentor's comments