Improvements. ETEENA-620