VE-1408 refactored with better naming