refactoring COSMOS*-VP