final content and logic adjustments