refactoring of COSMOS*-VP