[COS] REFACTORING