fix once and for all

Darian old .. then merge kim’s