after the move of common logic to common