[COS] Changing logic