TODO adjustments