Small rework #2