WL-001 Fisrt change for JJ project. 24/5/2014