Ew/final adjustments