adjustments and integration with backend