Customer improvised and organize wew
Customer module conflict fixed