removed jwm from de list, fixed code mistake with if structure