reorganise partners + validation