Changes from arco and WEP fix from ivendor